cdb56c
@@ -256,7 +256,7 @@
public void run() {
                     task.getRequestId(), task.getTaskRunnerCallable().canFinish(),
                     preemptionQueue.size(), numSlotsAvailable.get(), waitQueue.size());
               }
-              if (numSlotsAvailable.get() == 0 && preemptionQueue.isEmpty()) {
+              if (numSlotsAvailable.get() == 0 && (enablePreemption == false || preemptionQueue.isEmpty())) {
                 shouldWait = true;
               }
             } else {
